feat: Implement default-field-values
#19001
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
the
S-waiting-on-review
ShoyuVanilla
force-pushed
the
default-field-values
branch
3 times, most recently
from
4adec34 to
3b0f463
Compare
Veykril
reviewed
Jan 25, 2025
Veykril
reviewed
Jan 25, 2025
ShoyuVanilla
force-pushed
the
default-field-values
branch
2 times, most recently
from
64677bb to
88b70c8
Compare
Veykril
approved these changes
Jan 27, 2025
crates/hir-def/src/lib.rs
Outdated
| @@ -516,6 +516,7 @@ pub type LocalModuleId = Idx<nameres::ModuleData>; | |||
| pub struct FieldId { | |||
| pub parent: VariantId, | |||
| pub local_id: LocalFieldId, | |||
| pub has_default: bool, | |||
There was a problem hiding this comment.
I just realized we have t his in FieldData already, so we can't we reuse that instead? If we have the ID we can trivially index into the variant_data where required.
crates/hir/src/lib.rs
Outdated
| @@ -1414,7 +1418,7 @@ impl Struct { | |||
| .variant_data | |||
| .fields() | |||
| .iter() | |||
| .map(|(id, _)| Field { parent: self.into(), id }) | |||
| .map(|(id, d)| Field { parent: self.into(), id, has_default: d.has_default }) | |||
There was a problem hiding this comment.
That is here we can fetch it via variant_data[id] since we already have db.struct_data(self.id).variant_data anyways
|
I'm rebasing to resolve conflicts 😄 |
|
Ah, sorry :) |
ShoyuVanilla
force-pushed
the
default-field-values
branch
from
c7949cf to
8aa6c09
Compare
|
Nevermind. They were quite easy to resolve |
github-merge-queue bot
pushed a commit
that referenced
this pull request
Jan 28, 2025
…-default-fields internal: backout `hir-*` changes from #19001
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves #18938